nanowrimo 04

This commit is broken. Someone stop me before I refactor again!