Intermediate Date Commit

Remove extra debug messages
Sort bug, WIP