Classes added and some TODO s