Dev

Master and dev are at the same functional level, but Dev is a major rewrite of the program in C++.