Rumia changes. Changed how certain methods worked.
Merge branch 'danthonywalker'