Back on track

Had issues, hopefully this commit works