getting this ready for deployment to server