I think I made some things work, probably