Moved some elements around
Merge remote-tracking branch 'Finnian/master'