last commit before moving to a OOish aproach