Moved constants into static fields, still testing
Merge
Fundamental beat detection compiles