Added attribute parsing, looks good so far