Fixed everything...refactoring...much wow