got code working, committing changes