looks good, enough of this (sorry for random commits, my new IDE setup was giving me a bit of grief so wanted to test that everything was working as expected…)