Moved some things around for 2014
Added/updated a bunch of tasks for cap 3