M8 demo version

will do further cleaning up