Some class changes to minimize code

Minimizing some old code, added some experimental code