11:07AM

Logic fixes to draft from previous commit