Finished implementation of components