Initial commit with Dov's classes