Migrating from SAL

Still migrating code from legacy SAL project