Backend updated and seperated. Working on comments