ToDo finish properly identifying variables - all prepared