Works now
Added some method header comments