[WIP] back to it after the flu knocked me on my butt