Initial commit and prototype working