This should be cleaned up before merge. @cheung31 should probably weigh in on if this is the right way to accomplish what you're looking for since he made modal.