stuff
resolving merge
adding action buttons object