moving stuff in preparation for other things