WIP Working
Remove Feature + refactor Instance to immutable class