System is now fully extensionifyed, final check over to clean code before merging into develop