WIP

Probably just reword this commit message, but maybe split stuff.