Updated class constuctors
Seperating some stuff.