somewhere near working again
only small point model changes in the end