New classes and a lot of updates, still just a sketch