Added more line by line checks, very much WIP. Failing unit test.