v.0.015 - PL view/CLI, cleanup required