End of the day commit

I need to read more about Watch Service API before I can continue :(