Started and added some stuff