Slightly better code, still not restricting people, but isn't giving me
the blatent errors I was getting earlier, I just need to debug it.