Revert 49c8dc6..f0d4300

This rolls back to commit 49c8dc60ce4d0f8a3eae825dce874c97d4b473e7.
asd
Revert f0d4300..7cbbea3

This rolls back to commit f0d4300b9af0e35228ebc85a593a1fcec5bc99ce.
some progress made