Moving remaining "old" code into new files as comments because this way
it feels like I'm making progress even when I'm really not yet.