ready for branch namspace:fix
store temporary changes
language namespace prototype finished