Moved array param valued to variables
Added removal of the opening slash to mimic the return the current class instance string
Added additional conditional checks and multiple TODO items