Made changes so I can push this live for now.