Finished to_add()
Fixed various bugs in preparation for development