Merge back from develop

Almost forgot these guys existed