[WIP] Initial refactor stick