More attribute code

Starting to get there, slowly!