WIP, more cleanup