WIP - More logical categories and variable windows