WIP adding features