Completed work on initial version... hopefully.