moving stuff around
everything back and working