Superscrot 2.0

Whole bunch of commits that I committed to the wrong branch then simply stopped caring.