Added the first steps of the parser plus cleaned some stuff up.