Overnight work

Targetting at this branch because this is were the new work seems to be happening.