Updated Fuctionality

All action items for Adam complete except AND-OR algorithms