Hey these are my changes feel free to merge them 

Note that Hubert and I will probably do the beam and angle detection based on C++ code so that we can correlate it with his code