Major revision

Coming into the final stages for Alpha V.2