Initial commit for possible code and architecture migration