Status: GREEN

1. Added a few changes from basecamp