Development TODO updated