Trying to get back to a usable state.

I really need to use this more.

Signed-off-by: Bill Traynor <wmat@alphatroop.com>