Moved everything into install