Updated for additional modules, dotfiles not working yet