Still messy need to organize a bit more. Set things private that should have been