temp commit, going with OOP now