Continuing to add functionality - work in progress