working on rearranging stuff