I need to "align the code" with what we've been discussing here these days and see what's going on