Fixing everything Stage 1

AFHJDGHJAGHASDFH