a commit before i make some serious switches around