Working, needs debugging lines removed