Removed Selector mess and replaced it with function pointers

code is much cleaner now