cleaned up specs, migrations and classes wip