Sprint 11 Complete - App to be tidied up