a bit of reorganisation
even more reorganisation
playin' around with bezier curves