Added real data, prepping Angular vars & additional validation