Just committing current state before I fiddle with some stuff.