Preliminary SAME-SF

SAME-SF working for given test case and other simple tests. More
testing should be done.