Prepping foundation for new object parsing