Switched names around a bit, also started working on this properly now :)