addin stuff
fixing up the prototype
fixing up the prototype
flirting with angular