update to be a non-static class for multiple uses, add new vars, clean things up