Initial commit of what I have so far