rename to make more sense
tidy up
more horrible hacks