Checkin of all work up to this point. This will be abandonded in favor of a more sophisticated simulation framework.