thoroughly dirty commit for syncing with laptop...