base tested master without dev changes- working base