debugging and posibly maing bugs, testing soon