Experimental prune

Prunes out code that's not germane to main theme, shuffles some stuff around.