Refactor

Leaving this open for now