Mani

Merged joshes code and made it working on my side. Its not showing the mayor right now