Refactor everything to noodle
Update to core class