Task #15,#16 and #18 completed

Working fine with other develop code. Fully Tested. Please use database
version 2 for these tasks.