[WIP] I broke some stuff last commit, I think it's fixed now