refactored 5.1a and b into own classes. Also bug fixes on 7b, but still needs some work, so marked as **work in progress** in the window title to indicate such