Basic scaffold structures in place but in need of tuning before running migrations