Initial commit, just getitng the pretty much final product out there