need to go back i think
big ui update
cleanup
merging with v2