Fully working version 0.1