Partly done decorators

Partly done decorators