WIP
Added support for repopulating with old input