Initial commit with classes