Core Improvements and  first "draft"