Updated for new style build/install; much simpler!