More progress toward something that could compile. Also, moved things around.