Sounds good to.
The whole thing gives me all kinds of ideas for the Enigma Class.
I found that the Engineering was just as..."easy" to develop on the Enigma as on the Enterprise Class. It's the function that is required there. the Needs of the power systems, routing and storage are very clear.
I abhor to think of how I'd have to arrange crew quarters like this.