Separating source from build
Merge branch 'master' into source
Attempting to not have to separate source and build