Changed naming, added solid class, cache moar variables
Merge branch 'master' into gh-pages