added todos and upcoming features