Started Merging

updated mcmanger to latest on old repo
deleted old stuff