wip

restarted from the beginning