s03-us48: finished + working unit test. Ready for merge