add shapeshifter submodule
spike a much more basic page
more tweaks
Merge pull request #1 from cobyism/simplify

Simplify everything