1st batch of work aggegated to 1 pull request

done