Merge pull request #5 from faizkhan00/michael-0921_z

stupid bug
Lots of RPC work
Cleanup and comments