ParseEngine functions working
old code
resolved conflicts