refactor
remove unused methods
attempt to thread message handling - not successful