Fixed problem with combining order of if statements, also found new bug
where doesn't like double digit numbers, fairly certain problem isn't
shunter, will look into late.r