[Anton] Major update

Too much to write in here.