Added more functionality

Implemented Gift and GiftBlock classes and fix some issues
Deleted file