Actions complete - still some bugs