finally locking things down and getting it working