Initial Commit
Evolving the class structure