Continue breaking out stuff from old prototype
mergefix lawl