Final commit
Added old stuff I forgot to