add all
going to do a major change