Yeah I was planning to leave this till the last PR as a sort of clean up, just to prevent breaking existing functionality