Added todo's and features