Initial PR

This is what I have so far.