Features 11 & 12 Completed. All Features completed