Converted to new code language

DO NOT PUSH TO SERVER YET