WIP: fix and break a lot of things