Starting to fix this motherfucker

Interrupted by matsuri!