Removed some crap, added in bits at the top