[WIP] sorcery 2.0