Bit of refractoring and a ton more work

1.7.10 update