UNTESTED – Port to Neue

Updates on the Neue side.

:construction: This needs to be tested against dosomething/dosomething#987