Finished App - Some Cleanup needed