Base merge of AI-Medium with new design, TODO:Catch up on some bugs