First commit, basic entities