Big commit to get Cameron up to speed with source