attemting to clean this up
working on it slowly
ok this should fix it