Added placeholders, and small cahnges to fix complie errors.