Adding: validation & parsing sorta working