Adding lots of stuff, lest repo broken