Scrub 1 && Overlay Design

Scrubbed some unnecessary functions, added some overlays about 25 %
done.