commiting some sandbox playing
update files
major refact for v2