Added constructors/destructors
Commented something out (please fix)