moving stuff around and adding tests