Fixed bug where it always opened at the beginning.. May have introduced another, but I cannot seem to reproduce it