Did some more stuff with #36. Tried to work on #49 but it didn't really work.