Added major functionality for the 3weeksprint