Major overhaul of syntax (server side) to make it more friendly