Restarting work on this. Commit to save previous work.