+todo, prototype names+, -old code