all added and working now