Is4cwn merge

Merging this into something useful because master branch is not usable as-is.  This includes a mountain of bigfixes and a complete visual overhaul.