initial commit - more complete