CastorCAD v2.0: WIP