Attributes unfinished

This is everything we'd got up to when you were at mine - it's not working atm though.