More TODO and allow numbers in environment for testing