Need design elements, need to do a lot of refactoring, and then wrap it up...