Components1, start to add components

Still a mess, probably won't be done today, want to keep progress.