Refactored maker. Views still missing.