moving stuff to main