Added functions from the other project and ignoring some stuff