First commit for nearly finished backend