Fixed DateTime bug. Impl ToDo's