Closes #40 and #66

Also assuming navigator is defined from now on