Added a few things, still not sure how to do this really.