moving stuff around so that stuff can be used correctly in the api