Add all of my changes and combined code.. everything should be set for darryl and asan