updated to bare essentials, will branch