Sightly refactor pt 5 - app now functional on device