maybe wait and later (after release) implement a final solution which will include use of class?