agree, will tidy up later -- mainly a note to self while refactoring