Start refactor into strict. Still shitty.