Code sorted :) Closes #5