Closing #6, Progress on #4