updating
small tweak again
very unfinished state
hacking on API
MUCH WILL BREAK NOW