yes we should, we should also be looking at @fabpot's branch on this 2.5 console