Fully Working commit

Everything works as far as I can tell. Only think we've yet to test is
the time decay, but that currently requires 2 weeks. Ready for live
testing.