Hunter's Pull Request

Told you I would send something tonight. Still no where near where I want it and have another branch I'm working on for the user stuff.