moving stuff around, more functionality