Basic funcionality ported
Some cleanup
Multipage stuff, changes psd demo