getting angulared, made a few changes to models