Merge Jack's branch

Just basic level layout and randomise functionality.