Build lap now in it's own file