added comments for behavior and TODOs for later