Atreus88 feature

Please review