Commit often

Commiting changes to implementation of the warp image class.