merged stuff, moved some files around.  Enverything still works pretty good