Moving stuff to the header file, gradually