Continuing rework.

Altering skap through skap class not working yet. Need to create a few
more checks, then it's time to jquery the shit outta it.