More Changes

Not finished yet