Merge
Put sliding on walls back in