- removing callback stuff for now
- simplify everything for speed
- some style