Core app complete

Finishing touches /refactoring required now