getting this into shape not ready for testing yet