Not quite done yet... gimme another week