Massive commit of stuff I forgot to commit a long time ago.
whole lotta shiiit.