Ok.... just about done. Paint is next (probably be a while though...)

Modified the mounts: