Features over SotA

INDEHOLDER INGENTING
Merge pull request #1 from SW2A305/Features-SotA

Features over SotA