Finished adding content. Need to write constructors, then move some files
around. Almost there...