Extended Rail Test implemented

as of 5:02pm 8/10/2014

Also some other changes made, mostly cleanup