Initial refactor commit