Lab 5 commit. Mostly working...