Build work; partially addresses issue #35