Issue 7 - Non-equity algorithms