Worked on type inference a little more