[15-05-2014] Basic classes updated. TODO list added.