Starting to get a bit further with this project now