Nathan's changes + header file + more stuff