Initial commit into new branch, parser changed throughout the code. Tests are being run and the scenario designer to be trimmed to a standalone version.