moving stuff around
need to inline templates :(