Fixed classes, continued work on SoulForge