FIR filter working.
Resolving merge conflicts