* Backported lost code in after harddrive crash.
* Much of ported code is a little rough and will need further revision