move stuff around so works in IDE