Implemented some stuff; broken