Added class and many TODOs