Tidied up bootstrap, changed behavior to add a hasOne value rather than overwrite entire array