Almost done with implementing XIB version