Jacked it all up, restructure, glad this is early in the project and nobody will ever notice, LOL