get inf dealt with (largely) and start writing testing