Some Changes, not Finished

Was doing some work, but am shutting down due to lightning, so I'm gonna
push what I have.