Refactored variables controller
Major rewrite/simplification of existing controllers