#56 - Started to refactor.