Made improvements, strategy pattern is not an issue at all. I didn't spend enough time in the right areas. Ended up sidetracked into Oracle Documentations too much. Todays class gave structure back...