...
First draft of interface alignment
...