Added new testing program, fixed some notable errors trying to just run the darn thing, recommend merging with master