wip: Added features
Fixed feature