Even more work on code

Even more work on code