Finished App (But needs some bug fixes)