Everything Works right now. Going to implement Peter's stuff in a bit
Merge remote-tracking branch 'origin/master'