Moar work
Merge commit because gnosticJade likes to disturb me!