Remove time related stuff, start work on real 'take' function