Feature/save custom attributes

Clever.