Finished issues #3,4,5

@bronhunston 
~requested: 700