Test is a little broken. Gonna deviate from tutorial at this point, I think