More structure built for the components, still missing alot