Added different classes for handling different things better. Also
improved calculations for plot positions and such. Not tested nor
working yet!