Added preliminary version of Bins task, also made some other fixes