This is the merge of all our stuff, there is potentially more code to merge, but at this point I think its done