unit test complete
simulation working
fix for handlers
Merge branch 'nir-4' into geka-work-3