Last Bug Hopefully
Forgot to change two members back to being private