Nearing final code