Pull request, with features!

Requires Citizens update to run.