this is not the way to go, note of work, deletion imminent.
basic refactor complete