Slap together

Running out of time, so slapping it together to finish later..