integration bonanza 2014! Seriously though, updated lots of stuff for integration sake