Changed the names of the object interfaces to avoid confusion :)
hopefully (but will likley add to it).