Adding final functionality... for now