WIP 10.01.2014

Check-in before a performance test