Brian's Sprint 5, bugs fixed.