(non-compiling) WIP

I will finish this WIP today or tomorrow.