Great refactor of 2014.