DO NOT MERGE

This is mainly intended to start a discussion on the current development phase