starting to clean this up