Nutting out the structure a bit more