wip
Final SIAM work