[WIP] Move around variable declarations