cleaned up migrations, added controller code