First commit seems to be working, had to get rid of lambda function :(