Okay - better for now but violating some angular-fu.