Version 1.1 Fully working app