Changed naming, added solid class, cache moar variables