Commit work from hack day 2013/01