Additions made, still a work in progress