john stuff
other stuff
slightly less awesome
clearing up conflicts