Reworking Code

Temp save so I can revert when I fail with my code reworking.