Additions

Did some brief changes on this today, basically just adding in another structure element. Also cleaned up the code a bit to make it simpler