Added some stuff for Ya and Jennyffer to work on for time being