Merge back from develop

Christ where did all of this come from