Start of re-design. Adding notifications...

Signed-off-by: svenake <svenake@gmail.com>