Started refactoring with foundation