Redo Autscape stuff in develop