#12 implemented. Testing and fixing are next