Copied Dchaves branch and added player movement (experimental)