Created by: mareksuscak
Should mitigate #401 (closed). This is work in progress. Let’s wait on others’ opinions.