Just adding some stuff I've done in the meantime.