initial commit
update
merging and prepping for prod