it might be working
closer to working
clean debugs and comments