Added a bunch of internal variables. Also testing branch/merge!