Sprint 3 Features + Bug fixing.