wip
wip
wip
system/component stuff getting in shape