Fixes #20, didn't need #21 first

Can track and not display...