resolve asset merge conflict
code cleanup pt1
idk
make pretty pt2
merged because oops
beamin and beamout
api work