Refactored modal
Updated to make tests pass and finished Readme