going back to dev branch
headed in a good direction
slightly different structure