Closing Issues #1-4