refactored two extremely buggy methods- works like a charm now.