finished up initial code for multi support