o moved to m's computer, front end merge