End of evening commit

Still working on using data in javascript