Finished first pass at structure