Revert "Revert "Dev""

Reverts chirowong/cms#4