Working Version

Implemented a more object-oriented Design