wip
final touches