Add some smarter chamber handling + type handling
Add some commented out migrations.