pull from repo
continued to refactor code to be more efficient.