Fixed addition for the most part, some bugs still need to be ironed out