I thought making stuff a bit simpler would be nice. deleted most of the stuff of this afternoon