Pull Requst: Initial branch

@thbishop can you please take a look at this?