works partially
wip
added info