re-write

Version 0.0 has been completely re-written.