Finished. Just need to clean up modal.