Major mods to dimensions

Signed-off-by: Jonsey <damianajones@yahoo.co.uk>