added todo tags and some classes to implement