Unit field is now fully configurable and loads everything in correctly.