added js methods to server methods
added Kristin's stuff