Added more components, attempted to add newlines (Eclipse may be deleting ending newlines?)