phase 2 mostly working