some fairly major changes to the tf april tag stuff