WIP - Going slowly, using all the reference I can