Some major cleaning-up and extending
Added runner specs