almost done with adding the mart stuff to the solution...