logic WIP
final commit