finally a commit that works! - matts stuff