Further steps to add functionality