everything basically working; much cleaner; needs labels and better colors