loads of new stuff + clean up, need more stuff coming later!