Fixing some issues and trying to figure out why this isn't working yet.