2/21 7:30pm Commit

Fixed placeholder and added caching