Make add return bool

Needs tweaks as it is currently messy.