2-8-24 code

Almost final Version
NOT TESTED.