Refactor, got framework up and running