I'm going to work on this more tomorrow