Added linux. Now to merge... Yuck.