Trying to add remove behaviour functionality

Not really enjoying this any more. Just feels a lot harder than it
should be. I think it would be easier with a relational db.