Lots of changes, added mutt (not setup yet)