Safety commit, I'll try to get everything working before friday(6.6.2014).