na - sanity checkin
Using the new libraries from refactoring