start working on testing support and nodification