Massive overhaul of almost everything + lobby