Working negotiation / jobs ending / etc...
Break classes down into their own modules