Refactor 2 [WIP]