Staged changes commit. All functionality now working.