Closing in on final functionality