Implemented Some Jade, added data