Made all things working and implemented some stuff