Feature/add functionality