Developing Issue #59

Most bugs should be fixed... Testing