restructuring everything to be more sane.