Updated base to include defragment and apigen
Working on contacts - person