Build pieces complete, unit testing support added