Ready for demo

Stilll unrefactored/commented