Work on binaries and subtasks
Add some tests