work in progress, added needs and categories