small things, here and there. Getting close now