More testing and refining of code. Throught testing i kindof rewrote several things. All under test