Adding project 2 base infrastructure