Add thursday and unit tests for the win !