well that was too painful..time test this
- got expired signal
- added correct initalize
- added shorthand macro for before and after