Changed some stuff and started putting the two prototypes togheter