Added Done and Search Commands

> Still missing date functions
> No block command yet
Also:
> Extracted testing function
> Cleaned up a bit of code