cleanup
introducing animations and more… still work in progress