started on wip logic