Implement core functionality and adjust for new architecture sans polyglot