Got some of the static analysis working