Pull Request: First branch

@brettweavnet can you take a look at this first stab and see if i am the right direction.