Couple new features

Probably done for the night, so PR