initial commit to ians branch. more work to come tonight