Content update, take 2

All content that we have as of 4/16 implemented.