Recovered mostly to where I was before
Rewriting stuff to use dynamic variables
Add compiler hints