#10 Properly fixing awkward merge :s