Trying to fix javascript, this will work eventually...