Can now compile
Moved all elisp to init.el
Tweak