Some initial changes

Gever,

Pull request for my fork. See my email for more details...

-Damon