Now mostly puppetized, although some cleanup would be nice