TODO: Push object creation higher up