code test

I will delete my fork at some point, so if you want to merge these changes - do it soon.