Committed some stuff to screw around with