Added a bunch of content, some working functions