Adding more content in how I think it should be