Newer code with new classes and fast plotting

Signed-off-by: dreademarco <andreajuve@gmail.com>