Now with icing and removed junky scripts