adds analyzer - but has some extra sloppy code