First go at implementing safte