WIP - updated with exemple classes for future work completion