More rework and added a system properties mgr