City Council votes to move forward with Edgemoor