attempt at reverting now

will have to manually merge by the looks of it,
we are all working in the same classes