Added all the extra stuff I've already done