final 2nd commit

unfinished, updated