Massive push 3.5e work in progress