Adding stuff. Fixing things