Final commit before hand-in.
Stable version. If shit goes to hell return here.