made some progress, still alot to be done unfortunately