merge dev into master

finished primary schema