Beginning stages of fixing issue 1.