Refactor WIP

Signed-off-by: Jesse Stuart <jesse@jessestuart.ca>