Fleshed more out or the base project