done with master and other basic setup