Relatively stable
Merge commit '94f07a9'
Merged properly, works properly, refactoring required.