v0.0-2 - Ready for handin