Major overhaul, eliminated any online functions