TODO updated. short term goals