WORKLING
BIG cleanup
done