Sprint 2 starts here - fixed compilation errors