Feature/decorator

Note that this depends on #142 to be merged first (as it is based on it)