Add most of the stuff