Merged drsch changes
stuff kind of works