Handled a few edge cases, added logging, waiting for new design