Updates to enable GetSomething (error handling still 100% not present.

Signed-off-by: Jason Kuster <unexpectedapocalypse@gmail.com>