move stuff into methods file