Closes #5 Not tested yet