App Almost Complete
Bugs Fixed