Basically done and should work but can't figure out why it doesn't