Finally starting on the real code base...