More subsystem implementation work
More subsystem implementation work