clean this stuff up
clean more
Working