Tidied up and ready to be split into poms for app and library