lesser refactor, move find functions to Misc