Change typing to accomodate 64 bit compartibility, but not sure if this is correct yet