#29 uml

I don't know too much about the testing, so focus on that.