changed type here, no cleartext
added in the rest of the required modules
this is sort of how I see this working, needs breakout of functions, etc.,..
finished up angular adds, moved some stuff around