wrote some stuff in Master.  Still a LONG way to go