Yeah probably right. Like the idea of separate mechanics from movement being removed, probably would have been eaiser to do anyway
