move numberstore to separate file