Initial commit with all the stuffies
initial merging