Added todo's and future enhancements