finished skeleton--added in stuff from other test projects