All main functionality seems to be working now