Updates for Issue 4, need to update Sporran itself now.