basic quickstart in place
pulling in master