getting setup for unit testing...
comitting in progress...
fixied merge from master...again