added filtering, testing built into code (Yeah, not great, but work in progress), added macros for converting to/from frequency