Reverted to functioning program, found EOF conditional that was causing bug
Merging old-state with the master branch, should be a WORKING COPY
Fix merge conflict in sender