Consolidated only

Progress PR, do not merge yet.

The changes are complete but require review.

Unit tests need to be updated to match new functions.
Can we have docstrings for this and consolidate_instance_flavor?