Finished App class, began control work