Fully working

See pic for contdtion