Renamed for clarity
Added getobject
Added some stubs
Merge pull request #23 from StafDehat/working

Working