Initial commit for overhaul to revision 0.9.2