Adding clickthroughts (dumb to have forgotten it) and more tests. Profiler tests to see if I can cut down bottlenecks more.