Making it parse, and adding hooks