testing pull

added some basic stuff, saw you made some significant changes in the js...not sure if there will be any conflicts here