Mani

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