Temporary commit, needs more refactoring before scenarios can be
implemented