Just reading through code and making some notes/running tests