Development stage

Enhancing the core