more changes... will all be squashed later anyhoo