Makes the modal section modular ish. Starts work on Issue #16