commit of partial setup for girish to take a look at