WIP: dependencies straightened out, missing templates