Really needs a little something more. Just some some QoL stuff.