More features, started useing package.el