Deliverable Candidate 2. Still missing comments and magic numbers