stashing changes
Cython working but not optimized yet