Initial commit (note: not yet thread safe)