Last commit for Today!

After being frustrated because of some anoying errors...
NullPointerExeption out of nowhere