checkpoint commit; figuring out decent pattern for modal, refactor of layout into more components coming up