Implemented more components, renamed to be implemented ones with an underscore