* Rearranging things a bit getting ready to angularize the code.