Removed backup folder, readded various things (mostly everything
is commented out that wasn't a quick fix).