Refactor.
Merge branch 'develop'
Added primary key.
Refactored maker. Views still missing.
Merge branch 'develop'