mid working commit, bunch of broken stuff
finish ice sliding
merge conflict