Another temporiry commit of current state of affairs.
updates