initial testing..tried to fix some bugs