Status: GREEN

1. Completed most changes from Basecamp TODO