updated namespace stuff to make swirl functions available