Added a bunch of new content, build still broken though