loads of work done. 99% done.

Still needs Votifier compat.