Still slightly coupled to my app but close