added a few new flags, will need to complete test before implementing these.