not working yet
improvements, but still need a bit of work