Fixed the fuckin' traders! Closes #2