commit subhunter, need to clean the project up quite a bit -sG