Pull request for FCO BBA 2012-2013

This is a work in progress, please don't review yet! :smile: