Simplifying some shit, more work on malf.