Didn't do this properly the first time

way too much stuff changed so... yeah