Some small progress I got done while at work. I'll hit this again tonight and then email everyone on Saturday morning with more of what needs to get done.
Merge pull request #20 from SonOfLysander/master

Some small progress I got done while at work. I'll hit this again tonigh...