basics for OO version
Working OO version, cleaning up some path /'s
Fixed trailing slash issue